Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 29 Oct 2011 17:26:38 +0000 (10:26 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 29 Oct 2011 17:26:38 +0000 (10:26 -0700)

Trivial merge